Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Add workflow to enforce rebase before merge #496

Merged
merged 1 commit into from
Jan 3, 2024

Conversation

xchapron-ledger
Copy link
Contributor

Description

Add a workflow to enforce a rebase before merge to ensure keeping a semi-linear history which allows to easily understand the commits change order and ensure easy cherry-picks.

Changes include

  • Bugfix (non-breaking change that solves an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Tests
  • Documentation
  • Other (for changes that might not fit in any category)

@codecov-commenter
Copy link

codecov-commenter commented Dec 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (86e20d8) 60.18% compared to head (1e43375) 60.18%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #496   +/-   ##
=======================================
  Coverage   60.18%   60.18%           
=======================================
  Files          12       12           
  Lines        1660     1660           
=======================================
  Hits          999      999           
  Misses        661      661           
Flag Coverage Δ
unittests 60.18% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@xchapron-ledger xchapron-ledger force-pushed the xch/force-rebase branch 8 times, most recently from 5ef612c to f24934e Compare December 21, 2023 15:40
@xchapron-ledger xchapron-ledger marked this pull request as ready for review December 21, 2023 15:42
.github/workflows/force-rebase.yml Outdated Show resolved Hide resolved
.github/workflows/force-rebase.yml Outdated Show resolved Hide resolved
.github/workflows/force-rebase.yml Outdated Show resolved Hide resolved
.github/workflows/force-rebase.yml Outdated Show resolved Hide resolved
.github/workflows/force-rebase.yml Outdated Show resolved Hide resolved
@xchapron-ledger xchapron-ledger merged commit 87f3e3e into master Jan 3, 2024
158 of 159 checks passed
@xchapron-ledger xchapron-ledger deleted the xch/force-rebase branch January 3, 2024 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants